From 5b7bed68a90ed15c2f2c255d7b10108322775575 Mon Sep 17 00:00:00 2001 From: Jakub Steiner Date: Thu, 3 Sep 2015 12:12:01 +0200 Subject: [PATCH] HighContrast: make linked entries align - reshuffled the stylesheet to easily allow having a thicker border, but decided to keep the 1px borders on entries as it makes easier to spot the buttons despite being flat. https://bugzilla.gnome.org/show_bug.cgi?id=753129 --- gtk/theme/HighContrast/_common.scss | 3 +- gtk/theme/HighContrast/_drawing.scss | 1 - gtk/theme/HighContrast/gtk.css | 617 +++++++++++++-------------- 3 files changed, 299 insertions(+), 322 deletions(-) diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss index 360a3ee36d..527ddc87f8 100644 --- a/gtk/theme/HighContrast/_common.scss +++ b/gtk/theme/HighContrast/_common.scss @@ -183,8 +183,9 @@ $ease-out-quad: cubic-bezier(0.25, 0.46, 0.45, 0.94); ****************/ .entry { - padding: 4px; + padding: 7px 4px; border-radius: 3px; + border-width: 1px; transition: all 200ms ease-out; @include entry(normal); &.flat, &.flat:focus { diff --git a/gtk/theme/HighContrast/_drawing.scss b/gtk/theme/HighContrast/_drawing.scss index e80d1b1888..2104505c0d 100644 --- a/gtk/theme/HighContrast/_drawing.scss +++ b/gtk/theme/HighContrast/_drawing.scss @@ -44,7 +44,6 @@ // background-color: transparent; border-style: solid; - border-width: 1px; background-image: linear-gradient(to bottom, darken($base_color,3%), $base_color 90%); diff --git a/gtk/theme/HighContrast/gtk.css b/gtk/theme/HighContrast/gtk.css index 4daa16a870..8b12793310 100644 --- a/gtk/theme/HighContrast/gtk.css +++ b/gtk/theme/HighContrast/gtk.css @@ -5,15 +5,15 @@ @define-color theme_selected_bg_color #000; @define-color theme_selected_fg_color #fff; @define-color insensitive_bg_color white; -@define-color insensitive_fg_color gray; +@define-color insensitive_fg_color #7f7f7f; @define-color insensitive_base_color #fff; @define-color theme_unfocused_fg_color #000; @define-color theme_unfocused_bg_color #fff; @define-color theme_unfocused_base_color #fff; @define-color theme_unfocused_selected_bg_color #000; @define-color theme_unfocused_selected_fg_color #fff; -@define-color borders gray; -@define-color unfocused_borders #8d8d8d; +@define-color borders #7f7f7f; +@define-color unfocused_borders #8b8b8b; @define-color warning_color #f57900; @define-color error_color #cc0000; @define-color success_color #73d216; @@ -92,7 +92,7 @@ color: #000; } .gtkstyle-fallback:insensitive { background-color: white; - color: gray; } + color: #7f7f7f; } .gtkstyle-fallback:selected { background-color: #000; color: #fff; } @@ -109,7 +109,7 @@ background-color: rgba(0, 0, 0, 0.2); } .overshoot.top { - background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent)); + background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(black), to(transparent)), -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent)); background-size: 100% 5%, 100% 100%; background-repeat: no-repeat; background-position: center top; @@ -117,7 +117,7 @@ border: none; box-shadow: none; } .overshoot.top:backdrop { - background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#8d8d8d), to(rgba(141, 141, 141, 0))); + background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#8b8b8b), to(rgba(139, 139, 139, 0))); background-size: 100% 5%; background-repeat: no-repeat; background-position: center top; @@ -125,7 +125,7 @@ border: none; box-shadow: none; } .overshoot.bottom { - background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent)); + background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(black), to(transparent)), -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent)); background-size: 100% 5%, 100% 100%; background-repeat: no-repeat; background-position: center bottom; @@ -133,7 +133,7 @@ border: none; box-shadow: none; } .overshoot.bottom:backdrop { - background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#8d8d8d), to(rgba(141, 141, 141, 0))); + background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#8b8b8b), to(rgba(139, 139, 139, 0))); background-size: 100% 5%; background-repeat: no-repeat; background-position: center bottom; @@ -141,7 +141,7 @@ border: none; box-shadow: none; } .overshoot.left { - background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent)); + background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(black), to(transparent)), -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent)); background-size: 5% 100%, 100% 100%; background-repeat: no-repeat; background-position: left center; @@ -149,7 +149,7 @@ border: none; box-shadow: none; } .overshoot.left:backdrop { - background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#8d8d8d), to(rgba(141, 141, 141, 0))); + background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#8b8b8b), to(rgba(139, 139, 139, 0))); background-size: 5% 100%; background-repeat: no-repeat; background-position: left center; @@ -157,7 +157,7 @@ border: none; box-shadow: none; } .overshoot.right { - background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent)); + background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(black), to(transparent)), -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent)); background-size: 5% 100%, 100% 100%; background-repeat: no-repeat; background-position: right center; @@ -165,7 +165,7 @@ border: none; box-shadow: none; } .overshoot.right:backdrop { - background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#8d8d8d), to(rgba(141, 141, 141, 0))); + background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#8b8b8b), to(rgba(139, 139, 139, 0))); background-size: 5% 100%; background-repeat: no-repeat; background-position: right center; @@ -174,7 +174,7 @@ box-shadow: none; } .label:insensitive, .label:backdrop:insensitive { - color: gray; } + color: #7f7f7f; } /********************* * Spinner Animation * @@ -197,45 +197,41 @@ * Text Entries * ****************/ .entry { - padding: 4px; + padding: 7px 4px; border-radius: 3px; + border-width: 1px; transition: all 200ms ease-out; background-color: transparent; border-style: solid; - border-width: 1px; background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%); - border-color: gray; - box-shadow: inset 0 2px 2px -2px gray; } + border-color: #7f7f7f; + box-shadow: inset 0 2px 2px -2px #7f7f7f; } .entry.flat, .entry.flat:focus { padding: 2px; background-color: transparent; border-style: solid; - border-width: 1px; background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%); - border-color: gray; - box-shadow: inset 0 2px 2px -2px gray; + border-color: #7f7f7f; + box-shadow: inset 0 2px 2px -2px #7f7f7f; border: none; border-radius: 0; } .entry:focus { background-color: transparent; border-style: solid; - border-width: 1px; background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%); border-color: #000; - box-shadow: inset 0 2px 2px -2px gray, inset 0 0 2px 1px #cccccc; } + box-shadow: inset 0 2px 2px -2px #7f7f7f, inset 0 0 2px 1px #cccccc; } .entry:insensitive { background-color: transparent; border-style: solid; - border-width: 1px; background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%); - color: gray; - border-color: gray; + color: #7f7f7f; + border-color: #7f7f7f; background-image: linear-gradient(to bottom, white); box-shadow: none; } .entry:backdrop { background-color: transparent; border-style: solid; - border-width: 1px; background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%); color: #000; background-image: linear-gradient(to bottom, #fff); @@ -243,9 +239,8 @@ .entry:backdrop:insensitive { background-color: transparent; border-style: solid; - border-width: 1px; background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%); - color: gray; + color: #7f7f7f; background-image: linear-gradient(to bottom, #fff); box-shadow: 0 1px rgba(255, 255, 255, 0); } .entry:selected, .entry:backdrop:selected { @@ -276,12 +271,11 @@ .linked.vertical .entry { background-color: transparent; border-style: solid; - border-width: 1px; background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%); - border-color: gray; - box-shadow: inset 0 2px 2px -2px gray; + border-color: #7f7f7f; + box-shadow: inset 0 2px 2px -2px #7f7f7f; background-image: linear-gradient(to bottom, #fff); - border-bottom-color: #d9d9d9; + border-bottom-color: #d8d8d8; box-shadow: none; } .linked.vertical .entry:focus { border-color: #000; @@ -289,82 +283,73 @@ .linked.vertical .entry:insensitive { background-color: transparent; border-style: solid; - border-width: 1px; background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%); - color: gray; - border-color: gray; + color: #7f7f7f; + border-color: #7f7f7f; background-image: linear-gradient(to bottom, white); box-shadow: none; - border-bottom-color: #d9d9d9; } + border-bottom-color: #d8d8d8; } .linked.vertical .entry:insensitive:backdrop { background-color: transparent; border-style: solid; - border-width: 1px; background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%); - color: gray; + color: #7f7f7f; background-image: linear-gradient(to bottom, #fff); box-shadow: 0 1px rgba(255, 255, 255, 0); - border-bottom-color: #dddddd; } + border-bottom-color: gainsboro; } .linked.vertical .entry:backdrop { background-color: transparent; border-style: solid; - border-width: 1px; background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%); color: #000; background-image: linear-gradient(to bottom, #fff); box-shadow: 0 1px rgba(255, 255, 255, 0); - border-bottom-color: #dddddd; } + border-bottom-color: gainsboro; } .linked.vertical .entry:first-child { background-color: transparent; border-style: solid; - border-width: 1px; background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%); - border-color: gray; - box-shadow: inset 0 2px 2px -2px gray; - border-bottom-color: #d9d9d9; } + border-color: #7f7f7f; + box-shadow: inset 0 2px 2px -2px #7f7f7f; + border-bottom-color: #d8d8d8; } .linked.vertical .entry:first-child:focus { background-color: transparent; border-style: solid; - border-width: 1px; background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%); border-color: #000; - box-shadow: inset 0 2px 2px -2px gray, inset 0 0 2px 1px #cccccc; } + box-shadow: inset 0 2px 2px -2px #7f7f7f, inset 0 0 2px 1px #cccccc; } .linked.vertical .entry:first-child:insensitive { background-color: transparent; border-style: solid; - border-width: 1px; background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%); - color: gray; - border-color: gray; + color: #7f7f7f; + border-color: #7f7f7f; background-image: linear-gradient(to bottom, white); box-shadow: none; - border-bottom-color: #dddddd; } + border-bottom-color: gainsboro; } .linked.vertical .entry:first-child:insensitive:backdrop { background-color: transparent; border-style: solid; - border-width: 1px; background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%); - color: gray; + color: #7f7f7f; background-image: linear-gradient(to bottom, #fff); box-shadow: 0 1px rgba(255, 255, 255, 0); - border-bottom-color: #dddddd; + border-bottom-color: gainsboro; border-top-style: solid; } .linked.vertical .entry:first-child:backdrop { background-color: transparent; border-style: solid; - border-width: 1px; background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%); color: #000; background-image: linear-gradient(to bottom, #fff); box-shadow: 0 1px rgba(255, 255, 255, 0); - border-bottom-color: #dddddd; } + border-bottom-color: gainsboro; } .linked.vertical .entry:last-child { background-color: transparent; border-style: solid; - border-width: 1px; background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%); - border-color: gray; - box-shadow: inset 0 2px 2px -2px gray; + border-color: #7f7f7f; + box-shadow: inset 0 2px 2px -2px #7f7f7f; border-top-width: 0; background-image: linear-gradient(to bottom, #fff); box-shadow: none; } @@ -374,24 +359,21 @@ .linked.vertical .entry:last-child:insensitive { background-color: transparent; border-style: solid; - border-width: 1px; background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%); - color: gray; - border-color: gray; + color: #7f7f7f; + border-color: #7f7f7f; background-image: linear-gradient(to bottom, white); box-shadow: none; } .linked.vertical .entry:last-child:insensitive:backdrop { background-color: transparent; border-style: solid; - border-width: 1px; background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%); - color: gray; + color: #7f7f7f; background-image: linear-gradient(to bottom, #fff); box-shadow: 0 1px rgba(255, 255, 255, 0); } .linked.vertical .entry:last-child:backdrop { background-color: transparent; border-style: solid; - border-width: 1px; background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%); color: #000; background-image: linear-gradient(to bottom, #fff); @@ -402,10 +384,9 @@ .entry.error:focus { background-color: transparent; border-style: solid; - border-width: 1px; background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%); border-color: #cc0000; - box-shadow: inset 0 2px 2px -2px gray, inset 0 0 2px 1px #f5cccc; } + box-shadow: inset 0 2px 2px -2px #7f7f7f, inset 0 0 2px 1px #f4cccc; } .entry.error:selected, .entry.error:selected:focus { background-color: #cc0000; } .entry.warning { @@ -414,10 +395,9 @@ .entry.warning:focus { background-color: transparent; border-style: solid; - border-width: 1px; background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%); border-color: #f57900; - box-shadow: inset 0 2px 2px -2px gray, inset 0 0 2px 1px #fde4cc; } + box-shadow: inset 0 2px 2px -2px #7f7f7f, inset 0 0 2px 1px #fde4cc; } .entry.warning:selected, .entry.warning:selected:focus { background-color: #f57900; } @@ -438,13 +418,13 @@ color: #000; background-image: none; background-color: #fff; - border-color: gray; } + border-color: #7f7f7f; } .button:hover, .button.flat:hover { border-width: 2px; border-style: solid; color: #000; background-color: #fff; - border-color: gray; + border-color: #7f7f7f; background-image: none; -gtk-image-effect: highlight; } .button:active, .button.flat:active, .button:checked, .button.flat:checked { @@ -453,14 +433,14 @@ background-image: none; color: white; background-color: black; - border-color: gray; + border-color: #7f7f7f; transition-duration: 50ms; } .button:backdrop, .button.flat:backdrop { border-width: 2px; border-style: solid; color: #000; background-color: #fff; - border-color: #8d8d8d; + border-color: #8b8b8b; background-image: none; text-shadow: none; icon-shadow: none; } @@ -468,37 +448,37 @@ border-width: 2px; border-style: solid; color: white; - background-color: #8d8d8d; - border-color: #8d8d8d; + background-color: #8b8b8b; + border-color: #8b8b8b; background-image: none; } .button:backdrop:insensitive, .button.flat:backdrop:insensitive { border-width: 2px; border-style: solid; - color: gray; + color: #7f7f7f; background-color: white; - border-color: #8d8d8d; + border-color: #8b8b8b; background-image: none; } .button:backdrop:insensitive:active, .button.flat:backdrop:insensitive:active { border-width: 2px; border-style: solid; - color: gray; - border-color: #8d8d8d; + color: #7f7f7f; + border-color: #8b8b8b; background-image: none; - background-color: #f6f6f6; } + background-color: whitesmoke; } .button:insensitive { border-width: 2px; border-style: solid; - color: gray; + color: #7f7f7f; background-color: white; - border-color: gray; + border-color: #7f7f7f; background-image: none; text-shadow: none; icon-shadow: none; } .button:insensitive:active, .button:insensitive.flat:active { border-width: 2px; border-style: solid; - color: gray; - border-color: gray; + color: #7f7f7f; + border-color: #7f7f7f; background-image: none; background-color: white; } .osd .button { @@ -529,7 +509,7 @@ border-width: 2px; border-style: solid; border-color: rgba(255, 255, 255, 0.2); - color: gray; } + color: #7f7f7f; } .osd .button:backdrop { border-width: 2px; border-style: solid; } @@ -566,16 +546,16 @@ .button.suggested-action:backdrop:insensitive { border-width: 2px; border-style: solid; - color: gray; + color: #7f7f7f; background-color: white; - border-color: #8d8d8d; + border-color: #8b8b8b; background-image: none; } .button.suggested-action:insensitive { border-width: 2px; border-style: solid; - color: gray; + color: #7f7f7f; background-color: white; - border-color: gray; + border-color: #7f7f7f; background-image: none; text-shadow: none; icon-shadow: none; } @@ -612,16 +592,16 @@ .button.destructive-action:backdrop:insensitive { border-width: 2px; border-style: solid; - color: gray; + color: #7f7f7f; background-color: white; - border-color: #8d8d8d; + border-color: #8b8b8b; background-image: none; } .button.destructive-action:insensitive { border-width: 2px; border-style: solid; - color: gray; + color: #7f7f7f; background-color: white; - border-color: gray; + border-color: #7f7f7f; background-image: none; text-shadow: none; icon-shadow: none; } @@ -641,13 +621,13 @@ color: #000; background-image: none; background-color: #fff; - border-color: gray; } + border-color: #7f7f7f; } .inline-toolbar GtkToolButton > .button:hover { border-width: 2px; border-style: solid; color: #000; background-color: #fff; - border-color: gray; + border-color: #7f7f7f; background-image: none; } .inline-toolbar GtkToolButton > .button:active { border-width: 2px; @@ -655,21 +635,21 @@ background-image: none; color: white; background-color: black; - border-color: gray; } + border-color: #7f7f7f; } .inline-toolbar GtkToolButton > .button:insensitive { border-width: 2px; border-style: solid; - color: gray; + color: #7f7f7f; background-color: white; - border-color: gray; + border-color: #7f7f7f; background-image: none; text-shadow: none; icon-shadow: none; } .inline-toolbar GtkToolButton > .button:insensitive:active { border-width: 2px; border-style: solid; - color: gray; - border-color: gray; + color: #7f7f7f; + border-color: #7f7f7f; background-image: none; background-color: white; } .inline-toolbar GtkToolButton > .button:backdrop { @@ -677,7 +657,7 @@ border-style: solid; color: #000; background-color: #fff; - border-color: #8d8d8d; + border-color: #8b8b8b; background-image: none; text-shadow: none; icon-shadow: none; } @@ -685,23 +665,23 @@ border-width: 2px; border-style: solid; color: white; - background-color: #8d8d8d; - border-color: #8d8d8d; + background-color: #8b8b8b; + border-color: #8b8b8b; background-image: none; } .inline-toolbar GtkToolButton > .button:backdrop:insensitive { border-width: 2px; border-style: solid; - color: gray; + color: #7f7f7f; background-color: white; - border-color: #8d8d8d; + border-color: #8b8b8b; background-image: none; } .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active { border-width: 2px; border-style: solid; - color: gray; - border-color: #8d8d8d; + color: #7f7f7f; + border-color: #8b8b8b; background-image: none; - background-color: #f6f6f6; } + background-color: whitesmoke; } .inline-toolbar.toolbar GtkToolButton > .button.flat { border-radius: 0; @@ -789,7 +769,7 @@ color: #fff; background-color: #000; } .menuitem.button.flat:insensitive { - color: gray; } + color: #7f7f7f; } GtkColorButton.button { padding: 4px; } @@ -833,14 +813,13 @@ GtkColorButton.button { .spinbutton .button { background-color: transparent; border-style: solid; - border-width: 1px; background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%); - border-color: gray; - box-shadow: inset 0 2px 2px -2px gray; + border-color: #7f7f7f; + box-shadow: inset 0 2px 2px -2px #7f7f7f; background-image: none; border-width: 0 0 0 1px; - border-color: rgba(128, 128, 128, 0.3); - color: #0d0d0d; + border-color: rgba(127, 127, 127, 0.3); + color: #0c0c0c; border-radius: 0; } .spinbutton .button:dir(rtl) { border-width: 0 1px 0 0; } @@ -849,17 +828,17 @@ GtkColorButton.button { background-color: rgba(0, 0, 0, 0.05); } .spinbutton .button:insensitive { box-shadow: none; - color: rgba(128, 128, 128, 0.3); } + color: rgba(127, 127, 127, 0.3); } .spinbutton .button:active { box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2); background-color: rgba(0, 0, 0, 0.1); } .spinbutton .button:backdrop { - border-color: rgba(141, 141, 141, 0.3); + border-color: rgba(139, 139, 139, 0.3); background-color: #fff; box-shadow: none; } .spinbutton .button:backdrop:insensitive { box-shadow: none; - color: rgba(128, 128, 128, 0.3); + color: rgba(127, 127, 127, 0.3); border-width: 0 0 0 1px; } .spinbutton .button:backdrop:insensitive:dir(rtl) { border-width: 0 1px 0 0; } @@ -869,27 +848,27 @@ GtkColorButton.button { color: #000; background-image: none; background-color: #fff; - border-color: gray; } + border-color: #7f7f7f; } .spinbutton.vertical .button:first-child:active { border-width: 2px; border-style: solid; background-image: none; color: white; background-color: black; - border-color: gray; } + border-color: #7f7f7f; } .spinbutton.vertical .button:first-child:hover { border-width: 2px; border-style: solid; color: #000; background-color: #fff; - border-color: gray; + border-color: #7f7f7f; background-image: none; } .spinbutton.vertical .button:first-child:insensitive { border-width: 2px; border-style: solid; - color: gray; + color: #7f7f7f; background-color: white; - border-color: gray; + border-color: #7f7f7f; background-image: none; text-shadow: none; icon-shadow: none; } @@ -898,7 +877,7 @@ GtkColorButton.button { border-style: solid; color: #000; background-color: #fff; - border-color: #8d8d8d; + border-color: #8b8b8b; background-image: none; text-shadow: none; icon-shadow: none; } @@ -908,27 +887,27 @@ GtkColorButton.button { color: #000; background-image: none; background-color: #fff; - border-color: gray; } + border-color: #7f7f7f; } .spinbutton.vertical .button:last-child:active { border-width: 2px; border-style: solid; background-image: none; color: white; background-color: black; - border-color: gray; } + border-color: #7f7f7f; } .spinbutton.vertical .button:last-child:hover { border-width: 2px; border-style: solid; color: #000; background-color: #fff; - border-color: gray; + border-color: #7f7f7f; background-image: none; } .spinbutton.vertical .button:last-child:insensitive { border-width: 2px; border-style: solid; - color: gray; + color: #7f7f7f; background-color: white; - border-color: gray; + border-color: #7f7f7f; background-image: none; text-shadow: none; icon-shadow: none; } @@ -937,16 +916,16 @@ GtkColorButton.button { border-style: solid; color: #000; background-color: #fff; - border-color: #8d8d8d; + border-color: #8b8b8b; background-image: none; text-shadow: none; icon-shadow: none; } .spinbutton.vertical .button:backdrop:insensitive { border-width: 2px; border-style: solid; - color: gray; + color: #7f7f7f; background-color: white; - border-color: #8d8d8d; + border-color: #8b8b8b; background-image: none; } .spinbutton.vertical.entry { border-radius: 0; } @@ -968,7 +947,7 @@ GtkComboBox { text-shadow: 0 1px white; icon-shadow: 0 1px white; } GtkComboBox:insensitive { - color: gray; + color: #7f7f7f; text-shadow: none; icon-shadow: none; } GtkComboBox:backdrop { @@ -976,7 +955,7 @@ GtkComboBox { text-shadow: none; icon-shadow: none; } GtkComboBox:backdrop:insensitive { - color: gray; } + color: #7f7f7f; } GtkComboBox .menuitem { text-shadow: none; } GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .view .vertical.separator, GtkPlacesSidebar.sidebar .view GtkComboBox .vertical.separator { @@ -1013,19 +992,19 @@ GtkComboBox { border-width: 0 0 1px; padding: 3px; } .toolbar.vertical { - border-right: 1px solid gray; } + border-right: 1px solid #7f7f7f; } .toolbar.vertical:dir(rtl) { border-right: none; - border-left: 1px solid gray; } + border-left: 1px solid #7f7f7f; } .toolbar.inline-toolbar, .toolbar.search-bar { border-style: solid; - border-color: gray; - background-color: #d9d9d9; - box-shadow: inset 0 2px 3px -1px #a4a4a4; } + border-color: #7f7f7f; + background-color: #d8d8d8; + box-shadow: inset 0 2px 3px -1px #a2a2a2; } .toolbar.inline-toolbar:backdrop, .toolbar.search-bar:backdrop { - border-color: #8d8d8d; - background-color: #d7d7d7; + border-color: #8b8b8b; + background-color: #d6d6d6; box-shadow: none; } /*************** @@ -1035,15 +1014,15 @@ GtkComboBox { .header-bar { border-width: 0 0 1px; border-style: solid; - border-color: gray; + border-color: #7f7f7f; border-radius: 7px 7px 0 0; background-color: transparent; background-image: linear-gradient(to bottom, white, #fff); - box-shadow: inset 0 -1px #d9d9d9, inset 0 1px #fff; + box-shadow: inset 0 -1px #d8d8d8, inset 0 1px #fff; padding: 6px; } .titlebar:backdrop, .header-bar:backdrop { - border-color: #8d8d8d; + border-color: #8b8b8b; background-color: #fff; background-image: none; box-shadow: none; } @@ -1070,7 +1049,7 @@ GtkComboBox { color: black; text-shadow: 0 1px rgba(0, 0, 0, 0.5); background-image: linear-gradient(to bottom, #0d0d0d, #050505); - box-shadow: inset 0 -1px #d9d9d9, inset 0 1px gray; } + box-shadow: inset 0 -1px #d8d8d8, inset 0 1px #7f7f7f; } .titlebar.selection-mode .button, .header-bar.selection-mode .button { border-width: 2px; @@ -1099,9 +1078,9 @@ GtkComboBox { .header-bar.selection-mode .button:insensitive { border-width: 2px; border-style: solid; - color: gray; + color: #7f7f7f; background-color: white; - border-color: gray; + border-color: #7f7f7f; background-image: none; text-shadow: none; icon-shadow: none; } @@ -1120,9 +1099,9 @@ GtkComboBox { .header-bar.selection-mode .button:backdrop:insensitive { border-width: 2px; border-style: solid; - color: gray; + color: #7f7f7f; background-color: white; - border-color: #8d8d8d; + border-color: #8b8b8b; background-image: none; } .titlebar.selection-mode .button.suggested-action, .header-bar.selection-mode .button.suggested-action { @@ -1131,14 +1110,14 @@ GtkComboBox { color: #000; background-image: none; background-color: #fff; - border-color: gray; } + border-color: #7f7f7f; } .titlebar.selection-mode .button.suggested-action:hover, .header-bar.selection-mode .button.suggested-action:hover { border-width: 2px; border-style: solid; color: #000; background-color: #fff; - border-color: gray; + border-color: #7f7f7f; background-image: none; } .titlebar.selection-mode .button.suggested-action:active, .header-bar.selection-mode .button.suggested-action:active { @@ -1147,14 +1126,14 @@ GtkComboBox { background-image: none; color: white; background-color: black; - border-color: gray; } + border-color: #7f7f7f; } .titlebar.selection-mode .button.suggested-action:insensitive, .header-bar.selection-mode .button.suggested-action:insensitive { border-width: 2px; border-style: solid; - color: gray; + color: #7f7f7f; background-color: white; - border-color: gray; + border-color: #7f7f7f; background-image: none; text-shadow: none; icon-shadow: none; } @@ -1164,7 +1143,7 @@ GtkComboBox { border-style: solid; color: #000; background-color: #fff; - border-color: #8d8d8d; + border-color: #8b8b8b; background-image: none; text-shadow: none; icon-shadow: none; } @@ -1172,9 +1151,9 @@ GtkComboBox { .header-bar.selection-mode .button.suggested-action:backdrop:insensitive { border-width: 2px; border-style: solid; - color: gray; + color: #7f7f7f; background-color: white; - border-color: #8d8d8d; + border-color: #8b8b8b; background-image: none; } .titlebar.selection-mode .selection-menu, .header-bar.selection-mode .selection-menu { @@ -1217,26 +1196,26 @@ GtkTreeView.view { -GtkTreeView-tree-line-width: 1; -GtkTreeView-tree-line-pattern: ''; -GtkTreeView-expander-size: 16; - border-left-color: gray; + border-left-color: #7f7f7f; border-top-color: #fff; } GtkTreeView.view:selected { border-radius: 0; } GtkTreeView.view:selected, GtkTreeView.view:backdrop:selected { - border-left-color: gray; + border-left-color: #7f7f7f; border-top-color: rgba(0, 0, 0, 0.1); } GtkTreeView.view:insensitive { - color: gray; } + color: #7f7f7f; } GtkTreeView.view:insensitive:selected { color: #666666; } GtkTreeView.view:insensitive:selected:backdrop { - color: gray; } + color: #7f7f7f; } GtkTreeView.view:insensitive:backdrop { - color: gray; } + color: #7f7f7f; } GtkTreeView.view.separator:backdrop { color: rgba(0, 0, 0, 0.1); } GtkTreeView.view:backdrop { color: #000; - border-left-color: gray; + border-left-color: #7f7f7f; border-top: #fff; } GtkTreeView.view.dnd { border-style: solid none; @@ -1244,21 +1223,21 @@ GtkTreeView.view { border-color: black; } GtkTreeView.view.expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); - color: #4d4d4d; } + color: #4c4c4c; } GtkTreeView.view.expander:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } GtkTreeView.view.expander:hover { color: #000; } GtkTreeView.view.expander:selected { - color: #b3b3b3; } + color: #b2b2b2; } GtkTreeView.view.expander:selected:hover { color: #fff; } GtkTreeView.view.expander:selected:backdrop { - color: #b3b3b3; } + color: #b2b2b2; } GtkTreeView.view.expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.expander:backdrop { - color: #4d4d4d; } + color: #4c4c4c; } GtkTreeView.view.progressbar { color: #fff; border: 1px solid #000; @@ -1280,12 +1259,12 @@ GtkTreeView.view { border-color: #000; } column-header .button { - color: gray; + color: #7f7f7f; font-weight: bold; text-shadow: none; box-shadow: none; } column-header .button:hover { - color: #404040; + color: #3f3f3f; box-shadow: none; } column-header .button:active { color: #fff; } @@ -1305,7 +1284,7 @@ column-header .button, column-header .button:hover, column-header .button:active column-header .button:backdrop { border-color: #fff; border-width: 0 1px 1px 0; - color: gray; + color: #7f7f7f; background-image: none; } column-header .button:backdrop:insensitive { border-width: 0 1px 1px 0; @@ -1341,7 +1320,7 @@ GtkTreeView.view.progressbar { box-shadow: inset 0 -3px #000; color: #000; } .menubar > .menuitem:insensitive { - color: gray; + color: #7f7f7f; box-shadow: none; } .menu { @@ -1353,9 +1332,9 @@ GtkTreeView.view.progressbar { color: #fff; background-color: #000; } .menu .menuitem:insensitive { - color: gray; } + color: #7f7f7f; } .menu .menuitem:insensitive:backdrop { - color: gray; } + color: #7f7f7f; } .menu .menuitem:backdrop, .menu .menuitem:backdrop:hover { color: #000; background-color: #fff; } @@ -1370,7 +1349,7 @@ GtkTreeView.view.progressbar { .popover { margin: 10px; padding: 2px; - border-color: gray; + border-color: #7f7f7f; border-width: 1px; border-style: solid; border-radius: 5px; @@ -1392,7 +1371,7 @@ GtkTreeView.view.progressbar { .popover.osd { background-image: none; background-color: rgba(0, 0, 0, 0.8); - border: 1px solid gray; + border: 1px solid #7f7f7f; color: #fff; } .popover.osd .button { color: white; @@ -1422,7 +1401,7 @@ GtkTreeView.view.progressbar { border-width: 2px; border-style: solid; border-color: rgba(255, 255, 255, 0.2); - color: gray; } + color: #7f7f7f; } /***************** * Notebooks and * @@ -1442,7 +1421,7 @@ GtkTreeView.view.progressbar { .notebook:backdrop { background-color: #fff; } .notebook.frame { - border: 1px solid gray; } + border: 1px solid #7f7f7f; } .notebook.frame.top { border-top-width: 0; } .notebook.frame.bottom { @@ -1452,11 +1431,11 @@ GtkTreeView.view.progressbar { .notebook.frame.left { border-left-width: 0; } .notebook.frame:backdrop { - border-color: #8d8d8d; } + border-color: #8b8b8b; } .notebook.header { - background-color: #d9d9d9; } + background-color: #d8d8d8; } .notebook.header.frame { - border: 1px solid gray; } + border: 1px solid #7f7f7f; } .notebook.header.frame.top { border-bottom-width: 0; } .notebook.header.frame.bottom { @@ -1466,25 +1445,25 @@ GtkTreeView.view.progressbar { .notebook.header.frame.left { border-right-width: 0; } .notebook.header.frame:backdrop { - border-color: #8d8d8d; } + border-color: #8b8b8b; } .notebook.header.top { - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px gray; } + box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px #7f7f7f; } .notebook.header.top:backdrop { - box-shadow: inset 0 -1px #8d8d8d; } + box-shadow: inset 0 -1px #8b8b8b; } .notebook.header.bottom { - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px gray; } + box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px #7f7f7f; } .notebook.header.bottom:backdrop { - box-shadow: inset 0 1px #8d8d8d; } + box-shadow: inset 0 1px #8b8b8b; } .notebook.header.right { - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 gray; } + box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 #7f7f7f; } .notebook.header.right:backdrop { - box-shadow: inset 1px 0 #8d8d8d; } + box-shadow: inset 1px 0 #8b8b8b; } .notebook.header.left { - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 gray; } + box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 #7f7f7f; } .notebook.header.left:backdrop { - box-shadow: inset -1px 0 #8d8d8d; } + box-shadow: inset -1px 0 #8b8b8b; } .notebook.header:backdrop { - background-color: #d7d7d7; + background-color: #d6d6d6; box-shadow: none; } .notebook tab { border-width: 0; @@ -1542,7 +1521,7 @@ GtkTreeView.view.progressbar { .notebook tab.right { border-left-width: 3px; } .notebook tab:hover, .notebook tab.prelight-page { - border-color: gray; } + border-color: #7f7f7f; } .notebook tab:active, .notebook tab.active-page, .notebook tab:backdrop:active { border-color: #000; } .notebook tab:backdrop { @@ -1551,17 +1530,17 @@ GtkTreeView.view.progressbar { .notebook tab.reorderable-page.top { border-color: transparent; } .notebook tab.reorderable-page.top:hover, .notebook tab.reorderable-page.top.prelight-page { - border-color: rgba(128, 128, 128, 0.3); - border-bottom-color: gray; + border-color: rgba(127, 127, 127, 0.3); + border-bottom-color: #7f7f7f; background-color: rgba(255, 255, 255, 0.2); } .notebook tab.reorderable-page.top:active, .notebook tab.reorderable-page.top.active-page { background-color: rgba(255, 255, 255, 0.5); - border-color: rgba(128, 128, 128, 0.5); + border-color: rgba(127, 127, 127, 0.5); border-bottom-color: #000; } .notebook tab.reorderable-page.top:active:hover, .notebook tab.reorderable-page.top.active-page:hover { background-color: rgba(255, 255, 255, 0.7); } .notebook tab.reorderable-page.top:active:backdrop, .notebook tab.reorderable-page.top.active-page:backdrop { - border-color: #8d8d8d; + border-color: #8b8b8b; background-color: #fff; border-bottom-color: #000; } .notebook tab.reorderable-page.top:backdrop { @@ -1570,17 +1549,17 @@ GtkTreeView.view.progressbar { .notebook tab.reorderable-page.bottom { border-color: transparent; } .notebook tab.reorderable-page.bottom:hover, .notebook tab.reorderable-page.bottom.prelight-page { - border-color: rgba(128, 128, 128, 0.3); - border-top-color: gray; + border-color: rgba(127, 127, 127, 0.3); + border-top-color: #7f7f7f; background-color: rgba(255, 255, 255, 0.2); } .notebook tab.reorderable-page.bottom:active, .notebook tab.reorderable-page.bottom.active-page { background-color: rgba(255, 255, 255, 0.5); - border-color: rgba(128, 128, 128, 0.5); + border-color: rgba(127, 127, 127, 0.5); border-top-color: #000; } .notebook tab.reorderable-page.bottom:active:hover, .notebook tab.reorderable-page.bottom.active-page:hover { background-color: rgba(255, 255, 255, 0.7); } .notebook tab.reorderable-page.bottom:active:backdrop, .notebook tab.reorderable-page.bottom.active-page:backdrop { - border-color: #8d8d8d; + border-color: #8b8b8b; background-color: #fff; border-top-color: #000; } .notebook tab.reorderable-page.bottom:backdrop { @@ -1589,17 +1568,17 @@ GtkTreeView.view.progressbar { .notebook tab.reorderable-page.left { border-color: transparent; } .notebook tab.reorderable-page.left:hover, .notebook tab.reorderable-page.left.prelight-page { - border-color: rgba(128, 128, 128, 0.3); - border-right-color: gray; + border-color: rgba(127, 127, 127, 0.3); + border-right-color: #7f7f7f; background-color: rgba(255, 255, 255, 0.2); } .notebook tab.reorderable-page.left:active, .notebook tab.reorderable-page.left.active-page { background-color: rgba(255, 255, 255, 0.5); - border-color: rgba(128, 128, 128, 0.5); + border-color: rgba(127, 127, 127, 0.5); border-right-color: #000; } .notebook tab.reorderable-page.left:active:hover, .notebook tab.reorderable-page.left.active-page:hover { background-color: rgba(255, 255, 255, 0.7); } .notebook tab.reorderable-page.left:active:backdrop, .notebook tab.reorderable-page.left.active-page:backdrop { - border-color: #8d8d8d; + border-color: #8b8b8b; background-color: #fff; border-right-color: #000; } .notebook tab.reorderable-page.left:backdrop { @@ -1608,17 +1587,17 @@ GtkTreeView.view.progressbar { .notebook tab.reorderable-page.right { border-color: transparent; } .notebook tab.reorderable-page.right:hover, .notebook tab.reorderable-page.right.prelight-page { - border-color: rgba(128, 128, 128, 0.3); - border-left-color: gray; + border-color: rgba(127, 127, 127, 0.3); + border-left-color: #7f7f7f; background-color: rgba(255, 255, 255, 0.2); } .notebook tab.reorderable-page.right:active, .notebook tab.reorderable-page.right.active-page { background-color: rgba(255, 255, 255, 0.5); - border-color: rgba(128, 128, 128, 0.5); + border-color: rgba(127, 127, 127, 0.5); border-left-color: #000; } .notebook tab.reorderable-page.right:active:hover, .notebook tab.reorderable-page.right.active-page:hover { background-color: rgba(255, 255, 255, 0.7); } .notebook tab.reorderable-page.right:active:backdrop, .notebook tab.reorderable-page.right.active-page:backdrop { - border-color: #8d8d8d; + border-color: #8b8b8b; background-color: #fff; border-left-color: #000; } .notebook tab.reorderable-page.right:backdrop { @@ -1627,12 +1606,12 @@ GtkTreeView.view.progressbar { .notebook tab GtkLabel { padding: 0 2px; font-weight: bold; - color: gray; + color: #7f7f7f; /* color: inherit doesn't work here */ } .notebook tab GtkLabel:backdrop, .notebook tab GtkLabel.prelight-page:backdrop { - color: gray; } + color: #7f7f7f; } .notebook tab.prelight-page GtkLabel, .notebook tab GtkLabel.prelight-page { - color: #404040; } + color: #3f3f3f; } .notebook tab.active-page GtkLabel, .notebook tab GtkLabel.active-page { color: #000; } .notebook tab.active-page GtkLabel:backdrop, .notebook tab GtkLabel.active-page:backdrop { @@ -1648,7 +1627,7 @@ GtkTreeView.view.progressbar { border-style: solid; color: #000; background-color: #fff; - border-color: gray; + border-color: #7f7f7f; background-image: none; border-width: 2px; background-image: none; @@ -1659,7 +1638,7 @@ GtkTreeView.view.progressbar { background-image: none; color: white; background-color: black; - border-color: gray; + border-color: #7f7f7f; border-width: 2px; } .notebook tab .button:backdrop, .notebook tab .button:backdrop:hover { color: rgba(0, 0, 0, 0.3); @@ -1687,11 +1666,11 @@ GtkTreeView.view.progressbar { .scrollbar.slider { border-radius: 20px; border: 5px solid transparent; - background-color: gray; } + background-color: #7f7f7f; } .scrollbar.slider:backdrop, .scrollbar.slider:insensitive { - background-color: #e6e6e6; } + background-color: #e5e5e5; } .scrollbar.slider:hover { - background-color: #4d4d4d; } + background-color: #4c4c4c; } .scrollbar.slider:prelight:active { background-color: #000; } .scrollbar.slider.fine-tune { @@ -1736,8 +1715,8 @@ GtkSwitch { border-width: 1px; border-style: solid; border-radius: 3px; - border-color: gray; - background-color: #cccccc; + border-color: #7f7f7f; + background-color: #cbcbcb; box-shadow: inset 0 1px rgba(0, 0, 0, 0.1); /*outset not working*/ text-shadow: 0 1px rgba(0, 0, 0, 0.1); } @@ -1747,25 +1726,25 @@ GtkSwitch { background-color: #000; text-shadow: 0 0 2px white; } GtkSwitch.trough:insensitive { - color: gray; - border-color: gray; + color: #7f7f7f; + border-color: #7f7f7f; background-color: white; text-shadow: none; } GtkSwitch.trough:backdrop { color: #000; - border-color: #8d8d8d; + border-color: #8b8b8b; background-color: #fff; box-shadow: none; text-shadow: none; } GtkSwitch.trough:backdrop:active { color: #fff; - border-color: #8d8d8d; - background-color: #8d8d8d; + border-color: #8b8b8b; + background-color: #8b8b8b; box-shadow: none; } GtkSwitch.trough:backdrop:insensitive, GtkSwitch.trough:backdrop:insensitive:active { background-color: white; - color: gray; - border-color: gray; } + color: #7f7f7f; + border-color: #7f7f7f; } GtkSwitch.slider { border-radius: 3px; border-width: 2px; @@ -1773,24 +1752,24 @@ GtkSwitch { color: #000; background-image: none; background-color: #fff; - border-color: gray; - box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px silver; } + border-color: #7f7f7f; + box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px #bfbfbf; } GtkSwitch.slider:hover { border-width: 2px; border-style: solid; color: #000; background-color: #fff; - border-color: gray; + border-color: #7f7f7f; background-image: none; - box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px silver; } + box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px #bfbfbf; } GtkSwitch.slider:active { border-color: #000; } GtkSwitch.slider:insensitive { border-width: 2px; border-style: solid; - color: gray; + color: #7f7f7f; background-color: white; - border-color: gray; + border-color: #7f7f7f; background-image: none; text-shadow: none; icon-shadow: none; } @@ -1799,18 +1778,18 @@ GtkSwitch { border-style: solid; color: #000; background-color: #fff; - border-color: #8d8d8d; + border-color: #8b8b8b; background-image: none; text-shadow: none; icon-shadow: none; } GtkSwitch.slider:backdrop:active { - border-color: #8d8d8d; } + border-color: #8b8b8b; } GtkSwitch.slider:backdrop:insensitive { border-width: 2px; border-style: solid; - color: gray; + color: #7f7f7f; background-color: white; - border-color: #8d8d8d; + border-color: #8b8b8b; background-image: none; } /************************* @@ -1825,19 +1804,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { background-image: none; -gtk-icon-source: -gtk-icontheme("checkbox-symbolic"); } .check:hover { - color: #333333; } + color: #323232; } .check:checked, .check:active { -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); } .check:checked:insensitive, .check:active:insensitive { - color: gray; } + color: #7f7f7f; } .check:checked:insensitive:backdrop, .check:active:insensitive:backdrop { - color: gray; } + color: #7f7f7f; } .check:checked:backdrop, .check:active:backdrop { color: #000; } .check:insensitive { - color: gray; } + color: #7f7f7f; } .check:insensitive:backdrop { - color: gray; } + color: #7f7f7f; } .check:inconsistent { -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); } .check:backdrop { @@ -1850,19 +1829,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { background-image: none; -gtk-icon-source: -gtk-icontheme("radio-symbolic"); } .radio:hover { - color: #333333; } + color: #323232; } .radio:checked, .radio:active { -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); } .radio:checked:insensitive, .radio:active:insensitive { - color: gray; } + color: #7f7f7f; } .radio:checked:insensitive:backdrop, .radio:active:insensitive:backdrop { - color: gray; } + color: #7f7f7f; } .radio:checked:backdrop, .radio:active:backdrop { color: #000; } .radio:insensitive { - color: gray; } + color: #7f7f7f; } .radio:insensitive:backdrop { - color: gray; } + color: #7f7f7f; } .radio:inconsistent { -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); } .radio:backdrop { @@ -1899,9 +1878,9 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { color: #000; background-image: none; background-color: #fff; - border-color: gray; + border-color: #7f7f7f; border-radius: 50%; - border-color: #787878; } + border-color: #777777; } .scale.slider:hover, .scale.scale-has-marks-above.scale-has-marks-below.slider:hover, .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:hover { @@ -1909,9 +1888,9 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { border-style: solid; color: #000; background-color: #fff; - border-color: gray; + border-color: #7f7f7f; background-image: none; - border-color: #787878; + border-color: #777777; border-radius: 50%; } .scale.slider:insensitive, .scale.scale-has-marks-above.scale-has-marks-below.slider:insensitive, @@ -1925,7 +1904,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop { border-style: solid; border-radius: 50%; - border-color: #858585; + border-color: #838383; background-image: none; box-shadow: none; } .scale.slider:backdrop:insensitive, @@ -1933,9 +1912,9 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive { border-width: 2px; border-style: solid; - color: gray; + color: #7f7f7f; background-color: white; - border-color: #8d8d8d; + border-color: #8b8b8b; background-image: none; } .scale.slider:active, .scale.scale-has-marks-above.scale-has-marks-below.slider:active, @@ -1948,8 +1927,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { border-width: 1px; border-style: solid; border-radius: 3px; - border-color: gray; - background-color: #cccccc; + border-color: #7f7f7f; + background-color: #cbcbcb; box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); } .scale.trough.highlight, .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight, @@ -1959,28 +1938,28 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .scale.trough.highlight:backdrop, .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight:backdrop, .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:backdrop { - border-color: gray; - background-color: gray; + border-color: #7f7f7f; + background-color: #7f7f7f; box-shadow: none; } .scale.trough:insensitive, .scale.trough.hilight:insensitive, .scale.scale-has-marks-above.scale-has-marks-below.trough:insensitive, .scale.scale-has-marks-above.scale-has-marks-below.trough.hilight:insensitive, .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:insensitive, .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.hilight:insensitive { - border-color: gray; + border-color: #7f7f7f; background-color: white; } .scale.trough:backdrop, .scale.scale-has-marks-above.scale-has-marks-below.trough:backdrop, .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop { - border-color: #8d8d8d; - background-color: silver; + border-color: #8b8b8b; + background-color: #bfbfbf; box-shadow: none; } .scale.trough:backdrop:insensitive, .scale.trough .hilight:backdrop:insensitive, .scale.scale-has-marks-above.scale-has-marks-below.trough:backdrop:insensitive, .scale.scale-has-marks-above.scale-has-marks-below.trough .hilight:backdrop:insensitive, .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop:insensitive, .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough .hilight:backdrop:insensitive { - border-color: gray; + border-color: #7f7f7f; background-color: #fff; } /***************** @@ -1991,7 +1970,7 @@ GtkProgressBar { font-size: 83%; color: #000; } GtkProgressBar:backdrop { - color: gray; } + color: #7f7f7f; } .progressbar { border-width: 1px; @@ -2017,12 +1996,12 @@ GtkProgressBar.trough { border-width: 1px; border-style: solid; border-radius: 3px; - border-color: gray; - background-color: lightgray; + border-color: #7f7f7f; + background-color: #d2d2d2; box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); } GtkProgressBar.trough:backdrop { - border-color: #8d8d8d; - background-color: #d7d7d7; + border-color: #8b8b8b; + background-color: #d6d6d6; box-shadow: 0 1px rgba(255, 255, 255, 0); } GtkProgressBar.trough.osd { background-color: transparent; @@ -2045,14 +2024,12 @@ GtkLevelBar.vertical { border-radius: 3px; background-color: transparent; border-style: solid; - border-width: 1px; background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%); - border-color: gray; - box-shadow: inset 0 2px 2px -2px gray; } + border-color: #7f7f7f; + box-shadow: inset 0 2px 2px -2px #7f7f7f; } .level-bar.trough:backdrop { background-color: transparent; border-style: solid; - border-width: 1px; background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%); color: #000; background-image: linear-gradient(to bottom, #fff); @@ -2093,19 +2070,19 @@ GtkLevelBar.vertical { color: #fff; outline-color: rgba(255, 255, 255, 0.3); } .view:backdrop:selected, GtkCalendar:backdrop:selected, GtkCalendar:backdrop:focus:selected, GtkCalendar:backdrop:hover:selected, .label:backdrop:selected, .entry:backdrop:selected, .menuitem.button.flat:backdrop:hover, .menuitem.button.flat:backdrop:selected, .list-row.activatable:backdrop:selected, .sidebar:backdrop:selected, GtkPlacesSidebar.sidebar .view:backdrop:selected, GtkPlacesSidebar.sidebar GtkCalendar:backdrop:selected { - background-color: gray; + background-color: #7f7f7f; color: #fff; } /********** * Frames * **********/ .frame { - border: 1px solid gray; + border: 1px solid #7f7f7f; padding: 0; } .frame.flat { border-style: none; } .frame:backdrop { - border-color: #8d8d8d; } + border-color: #8b8b8b; } .frame.action-bar { padding: 6px; border-width: 1px 0 0; } @@ -2117,7 +2094,7 @@ GtkScrolledWindow GtkViewport.frame { .separator, GtkPlacesSidebar.sidebar .view .separator, GtkPlacesSidebar.sidebar .view .separator:backdrop { - color: gray; } + color: #7f7f7f; } GtkFileChooserButton .separator.vertical, GtkFileChooserButton GtkPlacesSidebar.sidebar .view .vertical.separator, GtkPlacesSidebar.sidebar .view GtkFileChooserButton .vertical.separator, GtkFontButton .separator.vertical, GtkFontButton GtkPlacesSidebar.sidebar .view .vertical.separator, GtkPlacesSidebar.sidebar .view GtkFontButton .vertical.separator { -GtkWidget-wide-separators: true; } @@ -2126,10 +2103,10 @@ GtkPlacesSidebar.sidebar .view .separator:backdrop { *********/ .list, .list-row { background-color: #fff; - border-color: gray; } + border-color: #7f7f7f; } .list:backdrop, .list-row:backdrop { background-color: #fff; - border-color: #8d8d8d; } + border-color: #8b8b8b; } .list-row, .grid-child { @@ -2163,7 +2140,7 @@ GtkPlacesSidebar.sidebar .view .separator:backdrop { .list-row.activatable:selected:hover { background-color: black; } .list-row.activatable:selected:backdrop { - background-color: gray; } + background-color: #7f7f7f; } .list-row.activatable:selected .button.flat { color: #fff; } .list-row.activatable:selected .button.flat:hover { @@ -2188,9 +2165,9 @@ GtkPlacesSidebar.sidebar .view .separator:backdrop { padding: 10px; border-width: 0 1px 1px; border-style: solid; - border-color: gray; + border-color: #7f7f7f; border-radius: 0 0 6px 6px; - background-image: linear-gradient(to bottom, #f0f0f0 5%, whitesmoke); } + background-image: linear-gradient(to bottom, #efefef 5%, #f4f4f4); } .app-notification .button, .app-notification.frame .button { padding: 6px; } @@ -2211,22 +2188,22 @@ GtkExpander { * Calendar * ***********/ GtkCalendar { - border: 1px solid gray; } + border: 1px solid #7f7f7f; } GtkCalendar.button { padding: 0 4px; color: #999999; } GtkCalendar.button:hover { color: #000; } GtkCalendar.button:backdrop, GtkCalendar.button:backdrop:hover { - color: gray; } + color: #7f7f7f; } GtkCalendar.view { border-radius: 2px; } GtkCalendar.header { background: linear-gradient(to bottom, white, #fafafa); - border-bottom-color: silver; } + border-bottom-color: #bfbfbf; } GtkCalendar.header:backdrop { background-image: linear-gradient(to bottom, #fff); - border-bottom-color: #c6c6c6; } + border-bottom-color: #c5c5c5; } GtkCalendar:inconsistent, GtkCalendar:inconsistent:backdrop { color: alpha(currentColor,0.55); } GtkCalendar.highlight, GtkCalendar.highlight:backdrop { @@ -2252,13 +2229,13 @@ GtkCalendar { color: #000; background-image: none; background-color: #fff; - border-color: gray; } + border-color: #7f7f7f; } .message-dialog.csd .dialog-action-area .button:hover { border-width: 2px; border-style: solid; color: #000; background-color: #fff; - border-color: gray; + border-color: #7f7f7f; background-image: none; } .message-dialog.csd .dialog-action-area .button:active { border-width: 2px; @@ -2266,13 +2243,13 @@ GtkCalendar { background-image: none; color: white; background-color: black; - border-color: gray; } + border-color: #7f7f7f; } .message-dialog.csd .dialog-action-area .button:insensitive { border-width: 2px; border-style: solid; - color: gray; + color: #7f7f7f; background-color: white; - border-color: gray; + border-color: #7f7f7f; background-image: none; text-shadow: none; icon-shadow: none; } @@ -2281,16 +2258,16 @@ GtkCalendar { border-style: solid; color: #000; background-color: #fff; - border-color: #8d8d8d; + border-color: #8b8b8b; background-image: none; text-shadow: none; icon-shadow: none; } .message-dialog.csd .dialog-action-area .button:backdrop:insensitive { border-width: 2px; border-style: solid; - color: gray; + color: #7f7f7f; background-color: white; - border-color: #8d8d8d; + border-color: #8b8b8b; background-image: none; } .message-dialog.csd .dialog-action-area .button.suggested-action { border-width: 2px; @@ -2325,16 +2302,16 @@ GtkCalendar { .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive { border-width: 2px; border-style: solid; - color: gray; + color: #7f7f7f; background-color: white; - border-color: #8d8d8d; + border-color: #8b8b8b; background-image: none; } .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive { border-width: 2px; border-style: solid; - color: gray; + color: #7f7f7f; background-color: white; - border-color: gray; + border-color: #7f7f7f; background-image: none; text-shadow: none; icon-shadow: none; } @@ -2371,16 +2348,16 @@ GtkCalendar { .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive { border-width: 2px; border-style: solid; - color: gray; + color: #7f7f7f; background-color: white; - border-color: #8d8d8d; + border-color: #8b8b8b; background-image: none; } .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive { border-width: 2px; border-style: solid; - color: gray; + color: #7f7f7f; background-color: white; - border-color: gray; + border-color: #7f7f7f; background-image: none; text-shadow: none; icon-shadow: none; } @@ -2401,9 +2378,9 @@ GtkFileChooserDialog .search-bar { background-color: #fff; border-color: #fff; } GtkFileChooserDialog .dialog-action-box { - border-top: 1px solid gray; } + border-top: 1px solid #7f7f7f; } GtkFileChooserDialog .dialog-action-box:backdrop { - border-top-color: #8d8d8d; } + border-top-color: #8b8b8b; } /*********** * Sidebar * @@ -2413,10 +2390,10 @@ GtkFileChooserDialog .dialog-action-box { .sidebar:backdrop { background-color: #fff; } .sidebar > GtkScrolledWindow > .frame { - border-right: 1px solid gray; } + border-right: 1px solid #7f7f7f; } .sidebar > GtkScrolledWindow > .frame:dir(rtl) { border-right: none; - border-left: 1px solid gray; } + border-left: 1px solid #7f7f7f; } .list-row { padding: 0px; } @@ -2437,9 +2414,9 @@ GtkPlacesSidebar.sidebar .view { color: #000; background-color: transparent; } GtkPlacesSidebar.sidebar .view .image { - color: #4d4d4d; } + color: #4c4c4c; } GtkPlacesSidebar.sidebar .view .image:selected { - color: #e6e6e6; } + color: #e5e5e5; } .sidebar-item { padding: 10px 4px; } @@ -2459,9 +2436,9 @@ GtkPaned { margin-left: 8px; } .pane-separator { - background-image: linear-gradient(to bottom, gray); } + background-image: linear-gradient(to bottom, #7f7f7f); } .pane-separator:backdrop { - background-image: linear-gradient(to bottom, #8d8d8d); } + background-image: linear-gradient(to bottom, #8b8b8b); } GtkPaned.wide { -GtkPaned-handle-size: 5; @@ -2469,12 +2446,12 @@ GtkPaned.wide { GtkPaned.wide .pane-separator { background-color: transparent; border-style: none solid; - border-color: gray; + border-color: #7f7f7f; border-width: 1px; } GtkPaned.wide.vertical .pane-separator { border-style: solid none; } GtkPaned.wide .pane-separator:backdrop { - border-color: #8d8d8d; } + border-color: #8b8b8b; } /************** * GtkInfoBar * @@ -2527,9 +2504,9 @@ GtkInfoBar { .error .button:insensitive { border-width: 2px; border-style: solid; - color: gray; + color: #7f7f7f; background-color: white; - border-color: gray; + border-color: #7f7f7f; background-image: none; text-shadow: none; icon-shadow: none; } @@ -2551,9 +2528,9 @@ GtkInfoBar { .error .button:backdrop:insensitive { border-width: 2px; border-style: solid; - color: gray; + color: #7f7f7f; background-color: white; - border-color: #8d8d8d; + border-color: #8b8b8b; background-image: none; } .info .label:selected, .info .label:selected:focus, @@ -2634,7 +2611,7 @@ GtkColorSwatch { GtkColorSwatch.color-light:backdrop { color: rgba(0, 0, 0, 0.3); } GtkColorSwatch.overlay, GtkColorSwatch.overlay:selected { - border: 1px solid gray; } + border: 1px solid #7f7f7f; } GtkColorSwatch.overlay:hover, GtkColorSwatch.overlay:selected:hover { border-color: black; } GtkColorSwatch#add-color-button { @@ -2643,7 +2620,7 @@ GtkColorSwatch { color: #000; background-image: none; background-color: #fff; - border-color: gray; + border-color: #7f7f7f; border-style: solid; border-width: 1px; box-shadow: none; } @@ -2652,19 +2629,19 @@ GtkColorSwatch { border-style: solid; color: #000; background-color: #fff; - border-color: gray; + border-color: #7f7f7f; background-image: none; } GtkColorSwatch#add-color-button:backdrop { border-width: 2px; border-style: solid; color: #000; background-color: #fff; - border-color: #8d8d8d; + border-color: #8b8b8b; background-image: none; text-shadow: none; icon-shadow: none; border-width: 1px; - color: gray; } + color: #7f7f7f; } GtkColorSwatch#add-color-button .overlay { border-width: 2px; border-style: solid; @@ -2693,7 +2670,7 @@ GtkColorSwatch { border-radius: 0; margin: 4px; background-color: #fff; - border: solid 1px #8d8d8d; + border: solid 1px #8b8b8b; box-shadow: none; } .button.titlebutton { @@ -2708,20 +2685,20 @@ GtkColorSwatch { color: #000; background-image: none; background-color: #fff; - border-color: gray; } + border-color: #7f7f7f; } .button.titlebutton:active { border-width: 2px; border-style: solid; background-image: none; color: white; background-color: black; - border-color: gray; } + border-color: #7f7f7f; } .button.titlebutton:backdrop { border-width: 2px; border-style: solid; color: #000; background-color: #fff; - border-color: #8d8d8d; + border-color: #8b8b8b; background-image: none; text-shadow: none; icon-shadow: none; @@ -2825,7 +2802,7 @@ GtkColorSwatch { border-width: 2px; border-style: solid; border-color: rgba(255, 255, 255, 0.2); - color: gray; } + color: #7f7f7f; } .touch-selection .button:backdrop { border-width: 2px; border-style: solid; } -- 2.30.2